Skip to content

fix(db): implement proposed conflict handling #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
cadenkoj merged 1 commit into from
May 22, 2025
Merged

fix(db): implement proposed conflict handling #21

cadenkoj merged 1 commit into from
May 22, 2025

Conversation

@cadenkoj
Copy link
Owner

@cadenkoj cadenkoj commented May 22, 2025 •
edited by coderabbitai bot
Loading

TL;DR

Implement upsert functionality for threat indicators to handle duplicate submissions gracefully.

What changed?

  • Added the diesel::upsert::excluded import to support upsert operations
  • Implemented the ON CONFLICT DO UPDATE pattern in the add_indicator method to handle primary key conflicts
  • Removed the FIXME comment that was highlighting the need for this functionality
  • When a duplicate indicator is submitted, the system now updates the existing record with the new ciphertext instead of failing

How to test?

  1. Submit a threat indicator to the system
  2. Submit the same threat indicator again with potentially different content
  3. Verify that the second submission doesn't cause a 500 error
  4. Confirm that the indicator's content is updated to the latest submission

Why make this change?

This change prevents API 500 errors when legitimate duplicate indicators are submitted. Previously, submitting the same indicator twice would violate the primary key constraint and cause an error. Now, the system gracefully handles duplicates by updating the existing record, providing a more robust and user-friendly experience.

Summary by CodeRabbit

  • Bug Fixes
    • Improved reliability when adding encrypted indicators by ensuring that conflicts on existing entries now update the ciphertext automatically. This prevents errors related to duplicate entries and ensures data remains up to date.

@coderabbitai
Copy link

coderabbitai bot commented May 22, 2025 •
edited
Loading

Caution

Review failed

The pull request is closed.

Walkthrough

The update modifies the logic for inserting encrypted indicators into a database by introducing an upsert operation. Now, when a primary key conflict occurs during insertion, the ciphertext field is updated using the new value, streamlining conflict handling. The change also removes a previous comment regarding primary-key clashes.

Changes

File(s) Change Summary
src/node.rs Added Diesel's excluded import and replaced manual conflict handling in add_or_increment_indicator with an upsert (ON CONFLICT (id) DO UPDATE SET ciphertext = excluded.ciphertext). Removed related FIXME comment. No public API changes.

Sequence Diagram(s)

sequenceDiagram
    participant Caller
    participant Node
    participant Database

    Caller->>Node: add_or_increment_indicator(id, ciphertext)
    Node->>Database: INSERT indicator (id, ciphertext) ON CONFLICT (id) DO UPDATE SET ciphertext = excluded.ciphertext
    Database-->>Node: Success/Conflict handled
    Node-->>Caller: Result
Loading

Poem

In the warren where data flows deep,
Upserts now handle what once made us weep.
No more fuss with primary keys,
Conflicts resolved with relative ease.
Ciphertext updated, the code is neat—
A hop, a skip, and a database treat! 🐇✨

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 5065742 and 83e3fb2.

📒 Files selected for processing (1)
  • src/node.rs (2 hunks)
✨ Finishing Touches
  • 📝 Generate Docstrings
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@cadenkoj Graphite App
Copy link
Owner Author

cadenkoj commented May 22, 2025

This stack of pull requests is managed by Graphite. Learn more about stacking.

@cadenkoj cadenkoj marked this pull request as ready for review May 22, 2025 04:47
@cadenkoj cadenkoj merged commit d489fe0 into main May 22, 2025
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cadenkoj